Temporarily revert 185601 as it caused cmake build regressions.