Undo fix for Issue #222; Causes issues.