Fix attempt to fix @d96932749e