Rollback changes to Context find_variable