Revert "Merge branch 'master' of https://github.com/jlandersen/sw10"

This reverts commit 0324177424d0614a797b2c91094a185d0bf7e80e, reversing
changes made to 9dbcdd49d8af6bd08c44d4c41e4d1b1696a04952.