Remove obsolete workaround

Change-Id: I8c8e99036fe694a2fb0160250c7c0c4fefb98a3e