Revert "Fix #168"

Works great on 1.6. Fails hard on 1.7+.