Revert z16s changes

They don't work and break many things (verbose mode, zoning, puppet hps, etc).

If you are going to break my add-on, please ask me first :(
Merge pull request #795 from SnickySnacks/4.1-dev

Revert z16s changes