After upgrading to a more recent maven-scr-plugin which includes the fix for FELIX-593, the manually crafted component descriptors for component factories must be removed again and the generation using the scr plugin must be renabled.
This is the reverse task of SLING-502