Revert "Put in the right place"

This reverts commit c83ea9ce95a573920d63b8ac3beb45c28022137c.
Revert "Add Omni Version"

This reverts commit a4e903ec7de5bf158fab98263f596d97a7cbcad1.