Backing out 6ba07a3e0c80 (bug 892978) to fix test failures