Reverts code changes from 7b5a615e50 merge commit in preparation for better fix. Issue #655 and issue #1488.
7b5a615e50