Use a built in flag

Change-Id: I4d3c9250de2c94da2a5f53e5d2fb0c964bc0e191