rollback v1/v2 to component again (fixed NPE)