Fix for Bug 3034: Tabs not working
During a merge conflict this fix was overriden