Fix regression with ResourceClass/Flavor from recent rebase hell