there is a new macro so that the patch is no longer needed

Change-Id: I6a2c63566052def1d1d1ea2eb7cc8005453b01d1