Backed out changeset 8a4595cc5ec4 for Linux build failure on a CLOESD TREE
just kidding it's a CLOSED TREE

--HG--
extra : rebase_source : 163a9bff0ad836095057d5911b792c34517d14cc