Fix upstream API breakage