cc @jschatz1 @skyruler
For https://gitlab.com/gitlab-org/gitlab-ce/issues/18058 and https://gitlab.com/gitlab-org/gitlab-ce/issues/17983