Broken build v2.7.7b, attempt at class restoration
Broken build, v2.7.8b