This reverts commit 0b4c22edaa762e7c9cdf301f0e0a778a7bd76d15. This should now work according to #4243