Fix breakage from 12066b4cdd6f3f0352da369ec979991cbc472882