Re-restrict highline.

Though the upstream issues were fixed, there are still several failing tests
on JRuby 1.7.

This is a partial revert of 676bd51e2.