Revert 84315 for now. Re-thinking the patch.