correct widespread laziness

Change-Id: I9ed045062a4c5695439cfc18ba2ee2058b9233bd