Remove a possible source of funk that's been around since 4.1

Change-Id: If27981aad24f7f15c7f8f85d6062a016c7ce3bf3