am 39becb96: Revert "Fix another source of undeterministic inlining." DO NOT MERGE

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