bug 870370: EXTRA_COMPONENTS cleanup for conversion patches #1 & #2.