This reverts commit 4e911e2889ebe7f0a577a0323649dceb9cef363c. We don't need this change on the latest master. I'm unable to reproduce an original bug without this patch. Closes-Bug: #1834167 Change-Id: Iaffdb64fb0bc58525554ac9d40d2aeadb0876ffd