Revert revision 202518 because of wrong commit message.