This reverts commit e7987936c1. With 57f0574595 in master this workaround is not required anymore.
e7987936c1
57f0574595