Backout part of changeset 92c9c2e35e8b as it was already in the file. CLOSED TREE