bf6b451ae3
The workaround is no longer needed as the compiler emits the macro itself. Change-Id: I6a06e73353628bcea71f6bd23503ab6d8e42a29d