deis/deis — pull request #1179 by bacongobbler (2014-06-16 19:52:44+00:00)
Title: Hotfix revert

Needs more investigation on why the PR broke master.