Revert "Merge pull request #990 from TauLabs/gcs_refactor_fixed"

This reverts commit 1ce6631be0a51c0b9b75ebdaf9361333b39f05ac, reversing
changes made to 331185f52980a313d2afcfed412e4467f2941c49.

This merge (#990) broke using the GCS Control plugin. According to @guilhermito this wasn't fully implemented yet. I was already running it reverted on my local branches but now others are having issues too https://groups.google.com/forum/#!topic/phoenixpilot/0spdorCQKeg