Description
Backout the following fixes:
MB-35392 6e20f043a9440208c55bbc22653d82179ffd46a0
MB-34660 a3f7bb60ca6b9ac5e2fb666237695f916f9fa54b
MB-34666 18287d32d7e1317f56ae6a40a77f7b572a250847
Reason being the fixes has caused multiple regressions, and since this is a complicated area, we'll only retain the fix in 6.5 (Mad-Hatter), and backout the fixes in 5.5 to avoid potential additional regressions.