Backed out changeset 6a72a2510405 (bug 969436) for bustage