Reverted part of revision 02c347cdae86.