Fix bento build

Needs to go into 1.8.x as well.