r17110: revert a bad merge from the old trunk