Retain old components from refit

[nuclearslurpee]

To avoid retreading old ground, previous discussion on this suggestion was had in the main suggestions thread and can be found here.