Revert "Second attempt to fix without changing whitespace"

This reverts commit d60f13f98b397d92bf47f57eed1d1f31d4af8b4b.
Revert "Fix to Issue #26"

This reverts commit 10fd2d16929abfa906b714ce49fcf71d66611945.