Revert "Fixing it for real this time"

This reverts commit 2643e4f6cba0fe39e482c0b90585c20b2e5d23b5.

Previous fix bad, really fixing #3