Revert last commit; git revert was being a pita today :p

Change-Id: I4bda512ab0055909f7e867d95dc75a34ba5c5e55