One test failure after merge. This reverts commit 5b12f797. Change-Id: I120c49e53274471fc1c82a10d52e99c83f5f85cc