Backed out changeset aa8e746be488 (bug 944579) for bustage.