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

This reverts commit 538f0533ba32c6bbf0436a0a737434b62cbc25eb, reversing
changes made to 72d53a4acc9ef206e3a8e542024df395449f68bd.