Merge changes I6407c9b4,I49d9da67

* changes:
  Revert "Allow deoptimization when returning from a runtime method."
  Revert "Fix some issues for deoptimizing runtime methods."