This change doesn't break any tests, and seems to solve the issue.