Revert "Fix some issues for deoptimizing runtime methods."

Reason for revert:
    Some tests still failing, reverting the original CL.

This reverts commit 57b4e13d9528a3ebac05db280be1df92a261cf79.

Change-Id: I49d9da676be7a1994b39ea9046c8d62695ff8422
2 files changed