5.3 codebase downgrade (tests are left)