Revert "Fixes Issue #1"