Re-revert of r25349 per Brion on