I'm trying to create a 1.59.x that we can merge into gitlab-ce master. I think this change will do it.