Fix breakage from 10ba5e31d