Revert accidental changes from r258805