Bug 1055571 is fixed, remove the workaround.