Use API itself as context

Followup to Ib2ef8adfe9f3ffd77f855063b6680455fcdde47a

Change-Id: I9dc0a925dc9d59022983f935334437d92c56201d