Reverting changes.
<rdar://problem/100911934>
This was done in 255295@main.
Not sure why the revert commit wasn't linked to rdar and this bugzilla bug... Thank you for correcting Alexey.