Revert "Merge develop into issue-152"

Reverts TheWeatherCompany/dasein-cloud-core#93