adapted the ifdef'ed portion as well

Change-Id: I95ef44f12ad478677e761edb19528829d33363c9