back out even more wrong tools::Time changes, geez..

Change-Id: I52eb3400769999d7f554c3bdb8746f65b7990388