Backed out changeset b421a1fcd9c0 (bug 901456) for landing with the wrong bug number.