Revert revision 195965.