Revert r85536 pending a better fix