Ensure that mangling is exactly as before

BUG=
R=sigmund@google.com

Review URL: https://chromiumcodereview.appspot.com//18067002