Remove temp hack for bug 31187

Change-Id: I066f28c54dec98f9f71635e787d50008e2acf5d7