Needed for gitlab-org/gitlab-ce!3657
Related to gitlab-org/gitlab-ce#4009
/cc @DouweM @dblessing @rspeicher