Revert "Merge branch 'master' of https://github.com/bobbyziom/AquaControl"

This reverts commit 0e1da4f3e32293e646584fe7157a8019bac77543, reversing
changes made to 96f5c5993b6702d669132d0a348482cd3f35b5a0.