xStorable is obtained from a XComponent,
so use the original instead of requerying
a XComponent from the XStorable.

Change-Id: Iec5ca6ddcf3eedd193ec04129ba9aa1d13af1d0e