Backed out changeset efe3c7a0091c (bug 1016613) for causing bug 1054623 again