backport it again, I think I encountered some sort of topological defect in gitspace