Revert "Update from upstream"

Reverts innotech/dployr#52