Remove previous workarounds that were added to hide this problem. BUG: 272631 BUG: 272393 BUG: 320579