Revert "29Jul"

Reverts netzap/squire#2