Revert unintended changes from r86302