The underlying issue seems to be fixed, so let's drop the now obsolete workarounds. Introduced in 65be7042