Bug 1037432 - Backout changeset 9b85f3c5db29 in order to re-enable test.