This could prevent errors described in:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8970

Everything we're using right now, should be valid of course.