fixup! execution context issue

 * Introduced in 5836e3c15ff87da3054dc6f0bc12d7d54deb616e.

Change-Id: Ic9bf71a33fbd92a58c01fa449e901369e8591ba7