Revert "Track DU Theme chooser & Provider"

This reverts commit 6a7b967fcc7d1ef1b0229fa0708eaa17d85200ae.