Backed out changeset 45813096b581 (bug 853554) because it breaks the build