Revert "merge in upstream changes"

Reverts TheWeatherCompany/dasein-cloud-test#21