Fix build bustage from bug 942190 by porting the change to the interface. rs=jcranmer. CLOSED TREE