This reverts commit 8ca33bf0. 597-deopt-new-string is failing. Bug: 28846692 Bug: 28555675 Change-Id: Ibfb59ec36e089c987ea64e4af4ca3709e536412a