Does not work with the interpreter. Bug: 25641543 This reverts commit 952d6080. Change-Id: Ic112fa69c7ddd119cbccc5b65007b5ee4dfccd09