Revert r32227 as it breaks the build