Revert "Fix for Issue #666 (OTS review by Marc)."

This reverts commit 8dfb7e1f6cea2fdc0220ee7a84b02510ab6a8ce8.