Fix changed underlying API

Reviewer: @ab