Backed out changeset 772d552cbe95 (bug 1049303) for build bustage in ClientLayerManager on a CLOSED TREE