Revert "Work around https://github.com/simonmar/happy/issues/16"

This reverts commit 785b5a4182191932e32bd514afe6291ec182e7a0.