This was due to add_docker merging in master rather than rebasing onto master
This reverts commit 0abd3785, reversing changes made to 25326d77.