Merge "Revert "Do a type check for knowing if we can inline.""