make discount-show-always get along with setup discounts, RT#11512