It did not compile, and not using the deprecated macro fixes that
as a side-effect.

Change-Id: I97b8cd2ff1a650ec9d38cbf7eeb8780177a7fd7a