re #91: Properly strip component prefix