make this work again

Change-Id: I0ac5dfdea6b5785b1651c3b362bbddea2354e7c1
more cruft

Change-Id: Ia6b975080598a87c5e262374efde9efb186051b1