Tests are still broken. This reverts commit db56e11f. Change-Id: I7ed033c6bcb4bdb1e11859506c1ee73dffdad965