Revert "Fixing multiple version troubles"

This reverts commit af3454778d40ced599d2b43f2ce416fbc052984b.