am 040b52fe: Revert "Speculative fix for b/13772061."

* commit '040b52fe85a67eeb6d9a4e9dc20322ee36ad4aec':
  Revert "Speculative fix for b/13772061."