Revert "Merge branch 'omOss' of https://github.com/BeerDev/iOSapp into omOss"

This reverts commit 7f3a785215a2e926879cab4b1386dc23b1501184, reversing
changes made to b8d17f369506ef29bf4c7a2fbc2ae2ace0c332ac.