re #9627 Revert a change to use an interface that failed a unit test