Fix issue with vanilla pass through interfaces.