Revert "Zero update"

This reverts commit f5127ef408c6a48b56a22eab7949e27e1cfc3b37

Change-Id: I6ebde02eb0c2b5aa1579ec6887d782bd220b5af2