Classes 1.3
Revert "Classes 1.3"

This reverts commit 70f11686f19667b8d8c72c4fed62e51a8cc975f0.
Revert "Revert "Classes 1.3""

This reverts commit 42c2d28b151073be67d86743286a1965ffb4ab0e.