am d2053ac3: (-s ours) DO NOT MERGE: Revert "back to dogfood"

* commit 'd2053ac3481f15e5f408598a6d7f5ba7ac703d6d':
  DO NOT MERGE: Revert "back to dogfood"