Fix builds broken by bbfcbab7c8ea