Bug 930188 - backout due to poor testing