r2187: revert merge of r2150 from 3.0