This reverts commit 662dd29456. The root issue was fixed by the commit f554237b8e.
662dd29456
f554237b8e