Backout r1330649. The backport wasn't properly tested and broke the build. Sorry about that!
Backout r1330649. The backport wasn't properly tested and broke the build.
Sorry about that!


git-svn-id: f31f7a5323bbe4a1034a732b81b9abb714edbfbf@1330694 13f79535-47bb-0310-9956-ffa450edef68

wbond/subversion,wbond/subversion,wbond/subversion,wbond/subversion,wbond/subversion,wbond/subversion,wbond/subversion