Revert "Revert "[VFDSkinSelector]""

This reverts commit 2671c7d57899fcbc28ce691f8e85cf7caa50a130.