temporary workaround for #7800 …
the root of the problem should still be fixed as specified in the issue