Reverting line to re-use 'context'