Revert "Omnirom Gerrit!"

This reverts commit c69b048ee1b0598d22d28c8f30823eeac4e56880.