After the culprit has been found, the hack is not needed anymore.
This reverts commit 8cfd0464.
CCBUG: 438114
(cherry picked from commit 68ed1677)