moving changes from java_rewriting_engine4 branch

I will try it without the change.