This reverts commit 374fafd66a.
The root cause of the timeout has been addressed by:
Id22b1465d6d2424d90781983b970aba4545feb8a
We don't need that horrible hack.
Related-Bug: #1826281
Change-Id: I5f1c89e7fad7624c2edbf557ec39f5777b089d55
(cherry picked from commit 738486f108)