r=morse sr=alecf backout morse' change in 6/15 which remove the real fix. 6/15 build is fine, but 6/18 build is broken by morse's change. git-svn-id: svn://10.0.0.236/trunk@97360 18797224-902f-48f8-a5cc-f745e15eee43
r=morse sr=alecf backout morse' change in 6/15 which remove the real fix. 6/15 build is fine, but 6/18 build is broken by morse's change. git-svn-id: svn://10.0.0.236/trunk@97360 18797224-902f-48f8-a5cc-f745e15eee43