Tests fail to build. This reverts commit f78d6aa7. Change-Id: Ia220270517ded273c65a7ab965d82edb696663c9