fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/221 and https://gitlab.com/gitlab-org/gitlab-ee/issues/228