Revert back to old calc for promotions. Still some work to do here, but this is closer.