Remove 'awful hack' introduced when fixing issue 3029
Merge pull request #3134 from yebblies/issue3029

Remove 'awful hack' introduced when fixing issue 3029