Revert "Merge branch 'master' of https://github.com/jacksonGross/UniLife"

This reverts commit fb96a8bfd9d995bf31465873a90b6b68391fc47c, reversing
changes made to a3ed7d8c94758914786429995552c4a6bb449b18.
Re-Added PhoneLayer Changes