Backed out changeset a85d21e394c0 (bug 854503) for bustage.