Revert "Updates to 1.5.5"

This reverts commit a1cb14b2cd31c3b9cae670469249660a58118989.
17 files changed