Revert [23694] because the fix was bad.