Revert changes as per issue #680