This reverts commit 2c3c5b3554. Revisit this after https://gitlab.com/gitlab-org/gitlab-ce/issues/45441
2c3c5b3554