Backed out changeset 2cb4a65fdd66 (bug 1067502)