Backed out changeset 7ecc55933499 for red on OSX
Back out bug 831237 for red on a CLOSED TREE