[ci skip] Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15398
This reverts commit 516bcabbf4. Conflicts: Gemfile
516bcabbf4