This reverts commit r220811 and r220839. It made an incorrect change to musttail handling. llvm-svn: 221226