Revert Context patch