This reverts commit e38b74ba89. I failed to notice f19c961b4e461da045f2e72e73701059e5117be0; better use that fix instead.
e38b74ba89