Revert "Merge branch 'master' of https://github.com/boochu/485a-a1"

This reverts commit 85e620bc95d365331e3008a217c3d1cb34b78c63, reversing
changes made to de53dfa2c8326fb32c66dc90c72752a519a1f899.