am a21d821a: (-s ours) am 39becb96: Revert "Fix another source of undeterministic inlining." DO NOT MERGE

* commit 'a21d821a002dca4d28ef2d86760b9147b9f35de6':
  Revert "Fix another source of undeterministic inlining." DO NOT MERGE