This reverts commit a2b0ff0644.
a2b0ff0644
The fix was causing too many issues, it really needs a client-side fix MC-235045