Revert apparent typos from r53873