This reverts commit acae86293f. Testtools upstream is fixed. Change-Id: Idc5f51bef76e31d627a80c742f5587d51e373d22
acae86293f