This reverts commit 930b1c89fc. Extra things commited that shouldn't have been (experimental local tests). Change-Id: I43857d0e0f15f7d03d644491e0664dc5824984d3
930b1c89fc