Revert "Interface should match implementor"

This reverts commit 7ba056d38146914966463556cd7d7274daf68041.