Originally opened by @andywgrant at !2884 (closed)
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/13549