Revert "Pull in bugfix from upstream for WEB-11626"
Isn't ready for production and we need upstream patches.

This reverts commit 7ca9c65d8e5b244c1b0ee942cc2a3a74f97f5554.