This reverts commit 3e151d97adbff78be1b146938374a0dced5970e9.
Reason for revert: Upstream bug has been fixed
Change-Id: I5498030487677523ae71ae2f9a13074ab4552204
Related-Bug: #1872553
Closes-Bug: #1921354
(cherry picked from commit 24bbb72ac97bbd2683d0eae04b8ab4c3674005bc)