revert-context to the one in master branch