Revert "fixed for component also"

This reverts commit cace7535c60648aff52bf45aa436aa6f48df03b4.