Revert "2.3"

This reverts commit b55a689dc4cef5858911d1b2d2d9b51924730afa.
2.3 migration