Revert changes to shiftwidth and tabstop