Merge "Revert "Tweak inlining heuristics.""