Work around GCC bug

Change-Id: Ib53fd467cb270908846f8f613d9f085aeccdff01