Revert "1.0.8 attempt 2 (I broke errything)"

This reverts commit fa37d2a0e0a2fe0abfa4c012daa2d39f29eaba7a.