Component: Revert improvements to opaque component checks

Reverts commits cea19a9, 961ff32, and partially reverts 5ec4d85
Some issues have appeared on the forums so these commits have been
reverted while the issue is investigated.

Author: Anthony-Nicholls