Revert accidental change from r90630