Revert c807206..30fedcd

This rolls back to commit c8072068239d7246b723d976a096d47dd64c1642.
interface state