r17838: revert rev 17754