Revert "Sorry, I didn't test the effects of merging 2 PRs"
Merge pull request #198 from boot2docker/revert-196-sven-should-not-merge-fast

Revert "Sorry, I didn't test the effects of merging 2 PRs"