MULE-7883: Reverting schema rewrite line that was causing trouble. Addin...

...g test to cover scenario.