Revert "improved tax report, #23349"

Not ready to deploy yet.