Revert r21806 there are no users of it yet