Bug 948837 - Remove workaround of Bug 617115. r=blassey