Revert "More fixes in order to work with old baseline"

This reverts commit b823c83a9285a16158b638c146f10b9ce0334071.
Revert "Quick fix for old-style class in released baseline"

This reverts commit 3b1ca0332215e51d4a54e5618894951fbec8a464.