This reverts commit ab04e497f0. It seems that the other recent "fix" commit did fix the issue.
ab04e497f0