Fix #8

This largely reverts 82bcd10, discarding the ~15% performance gain in
favor of better compatibility.