REvert and fix

Change-Id: Ib4cee9cf89b3ddcce6d0a2f01db0764eacbe0e91