Upstream API breakage fix