Comment out bg-variant problem sections