Backported to bison 2.4