Revert "Merge pull request #1587 from will-Do/iface"

This reverts commit b65df85ef90c83e3f253b8852cd1797bdd2e71fb, reversing
changes made to a130f171947adc4cceb086d28fc11a8957459687.