Reverted revision 5170