Reverts back to '2720974 Merge fixes' to fix build.