Backed out changeset 1724a6c07316 (Bug 1073576) because of bad patch