Refactoring: restoreFromConditionExpression refactored