Revert "Merge branch '1980-fix-docker-builds' into 'master'
Revert "Merge branch '1980-fix-docker-builds' into 'master'

This reverts commit ced76657a213a83ca5c72d5ba407fffa657569f2, reversing
changes made to 7d69e7f0707c6115477f8ff5df1f922464e8265d.

gitlabhq/omnibus-gitlab,gitlabhq/omnibus-gitlab,gitlabhq/omnibus-gitlab,gitlabhq/omnibus-gitlab