Follow up tweak to the context reinjection
Merge commit '06e6ccda33673353859bc147b432aa8f1500bc28'