This reverts commit 5c0567dcc6. The issue had been fixed but I forgot to remove this workaround.
5c0567dcc6