Partial revert of c62117, remove component proxy check

Change-Id: I2ef8dc42d7238e9784f443f6e1190249f82bcfd1