patches to transform system to get rules running again
Merge pull request #2352 from twobraids/rewrite-fix

fixes Bug 1066120 - patches to transform system to get rules running again