Revert "Merge branch 'e3_521_update_cookiecutter' into 'master'"

This reverts merge request !11 (merged). As we have not released the new require yet, we should not have merged this in.