Fails 425 in debuggable mode. This reverts commit 4db0bf9c. Change-Id: I346df8f75674564fc4fb241c60f23e250fc7f0a7