Revert "Bugfix: change fields of Component"

This reverts commit b2f88dbc4463fe6112372e4e2bf62fcae4374073.
Test commit after revert previous commit