Revert "pilot version of interfaces"

This reverts commit ab52eb0b98dafc47073abedd818a2150ab341e7b.