r=javi / sr=alecf for backing out git-svn-id: svn://10.0.0.236/trunk@121480 18797224-902f-48f8-a5cc-f745e15eee43