Temporarily revert r303288