Revert "Merge branch 'ws' of https://github.com/WinneonSword/WaterCloset into ws"

This reverts commit 6b84eebea6710bd3f2fc89aaaf34e3721ac2c9c7, reversing
changes made to 1145929a09335d2751efd27ef020de4e09f9be96.