No idea what SDK problem this once worked around but surely it's
obsolete now.

Change-Id: I5cfa37710ea8cecee8acc9c8f5a6a08fae4babbd