Drop yevaud's internal interface for now