Bug 1093708 - backout 92713f2cea3a for bustage