Tests are still broken. This reverts commit 8d0e6a25. Change-Id: If046a1b0bc47fa73750a5296118ab879678f41b8