Revert "Merge branch 'use-https-in-dockerfile' into 'develop'"