Backed out changeset 5d60f3e1f6cf (bug 1067216) for breaking the build