Change-Id: I110d64343f2aa3e44e95238e28e42db48382a1c7
* And discard our old ones while at it. Change-Id: Ibe6d792d0c881b984d5ab0cfeb84473726d3303a