Revert "Make sure that cx23885 is selected for compilation"

This reverts commit 609453b55db34893c1b201994a51d2cdea776523.