Revert r85049, it is causing PR5367