Reverted PR #96

Revert of PR #96