Remove work-around for bug 982153 in >= Fx36