Revert "New Changes to 2.5.5"

This reverts commit 7a2bb057ba8b501e6008f24035c0cf2b465bc8ec, reversing
changes made to bb6c061b8652ebb9ec744b5fc0a94143731eb6c2.