Reverted some files to pre issue #2 fix
Revert "Fixed issue #2 for real this time."

This reverts commit fe2861f0287d22f98edd53a9018ab5f238fe2b24.

Restoring repo back to fresh, EOL-standardized version.