revert class version and iorules gymnastics which were not working properly