Clean-up a workaround that is no longer necessary.

With the previous commit [1], now Bug 27868748 is fixed and Bug 6789252
is no longer reproducible even without a workaround [2] for that.  Hence
this CL logically reverts [2] in favor of simplicity.

  [1]: If2a03bc84d318775fd4a197fa43acde086eda442
       aaa38c9f
  [2]: I66f51da1299532793ef8fa700f35b0811670f235
       4e5184f9

Bug: 27868748
Change-Id: Ic59af43343eb44d1d2c23a3f4018565e7a75b143