Revert ""Fixed" circular component references"