Revert "Merge branch 'new_omikron_branch' of https://github.com/CapsNo94/Omikron into new_omikron_branch"

This reverts commit 9eaded9e5bfca20f4ee1fc64423a0fe34a19996c, reversing
changes made to 094178bc907018d46c453c05e98bb528c742bdb1.
commit again