Revert rev. 66167.