Revert "NOBUG: attempted fix for list_valid_components."

This reverts commit 992bfa85e0349d2028da95252007078969317ba5.

(Reverting this because it didn't fix anything).