Revert "merge from upstream"

Reverts privatedata/ansible-docker-base#1