This fixed Optimizing but revealed the same issue in the interpreter. This reverts commit 241f9c41. Change-Id: Iad5a28b24f2c21d3575cf8ecc8b7c8fbf98d1132