Revert "squashed some commits from omnirom"

This reverts commit 06c90009386aa49c6b266efbb1b8a8af6d771f6a.