Really restore old compiler. Unit tests are working now