1.12bad
Revert "1.12bad"

This reverts commit 8f46df3e19adac034fd63701d9ebae120e9339ee.
Merge branch 'rewrite-with-discounts' of https://github.com/Scrapper89/BasisCode into rewrite-with-discounts