This reverts commit ad611a6223. A better fix was committed directly afterwards in 2afe06c18f
ad611a6223
2afe06c18f