Reverted revision 201717.