- Removing the workarounds that we had previously to get around this. Change-Id: I4f2b2f827988a7d76d86406542f647701df81a2d