Backed out changeset 3200ed3305db (bug 1014023) for causing bug 1051164.