This reverts commit 47b5b441.

See https://gitlab.com/gitlab-org/gitlab-ce/issues/17877#note_13488047