This reverts commit ad611a622374b3a2202684eda61e3f3207e5d3e1. A better fix was committed directly afterwards in 2afe06c18ffabf9a66c928d947549dcb54fff450