Remove 'awful hack' introduced when fixing issue 3029

https://d.puremagic.com/issues/show_bug.cgi?id=3029