Revert "Remove obsolete workaround."
This reverts commit 1f3ac758.
Bug: 72143978
Bug: 24465209
Test: Tested failing case on sailfish, reverted back all CL's since
Test: 3471433 for b/24465209 and apps open
(cherry picked from commit 7bb9785a)
Change-Id: Idd26e6c53320cd8b1be70b0894f4ed08e434b80d