This reverts commit 0ea451b4. 597-deopt-new-string is failing. Bug: 28846692 Bug: 28555675 Change-Id: I8274e5ae1d065dedc562132882b39e7f3fe5baf4