Watersmart 436

This fix seems to work for the problem described in WATERSMART-436, however, I'm not certain if this is the best approach.  Would appreciate if someone familiar with angular could review.
This is likely a fix for your single use case/workflow. There is a lot of risk (check the other workflows) in this change. I don't think you have any better options until we do a larger refactor.