Fixes build failures introduced by bad merge to mainline.
Attach a file by drag & drop or click to upload
