Revert tax disc AB test

Reverting this temporarily as it needs some fixes and tweaks.