Revert "Fix bug in ControlbarComponent and clean up the code [Finishes #78737770]"

This reverts commit 6d74271787b3965ab93859f07bdfa4c9c66b3594.