These workarounds were in place due to
https://gitlab.com/gitlab-org/gitlab/-/issues/213324. Now that that's
merged, these can be removed.