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