This goes back in time
Revert "updates for issue #651"

This reverts commit 21dc564e7e9337d9bd79ec8ad7599a885cc7f601.