Rollback interface changes 2