revert r288283 as it causes debug info (line numbers) to be lost in...

revert r288283 as it causes debug info (line numbers) to be lost in instrumented code. also revert r288299 which was a workaround for the problem.

llvm-svn: 288300