AC-1079 add condition attribute to retain ability to rebuild the origina...

...l expression.