Bug 1088551 - Backout changeset 18333b956bc3 in order to re-enable test.