the temporary context can finally die

Change-Id: I7dec2772000e25c4bd23f21b61dbd835ef9397cf