Fixes https://gitlab.com/gitlab-org/gitlab-ce/builds/11089742. See the commit message for more details.