The Principles of Optimal Income Taxation Revisited