restore more flags

Change-Id: Ieb3ad71c36f73b6277c3e5f30704f2d4668078a3