Really stupid hackish way to fix tax bug. #1604
Fix merge conflict.