This reverts commit 886ba78dfb. With the tests updated. Change-Id: I162e6ca23c667f90feddc1e9f42b554a416295cf
886ba78dfb