Backed out changeset 4096e474e5e0 (bug 916134).