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

This reverts commit 110f1eea83e28071090edec016b9d810d5190aff, reversing
changes made to a640958ca13598992321930eb8dd7ebdb955e1fa.