Revert revision 360862.