Backed out changeset 9c6b3b1f05ea (bug 950676) to check whether it's causing intermittent canvas failures