Remove unneeded guard

Change-Id: I62aceec1a7c00e99e47f6fc7c7ed2f25f2ccdfac