Backed out changeset 0aea65518be3 (bug 725587) for bustage.