rollback change from the last patch.

This doesn't seem to help on the issue #757 resolution