Hopefuly this restores some sanity for people that try several builds a day. Change-Id: I32fd6cb81238ab09f1560a676140383d95ed984c