This reverts commit a6f5bc54.

Now that the [correct fix has been merged][1], this workaround is no
longer necessary.

[1]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14115