Related to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21341/diffs. Come up from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21717#note_101219380