Taxation and Non-Discrimination: A Reconsideration