cb8f111a72
This commit was should fix issue #7586, but it does not.
This reverts commit e1c65ddfe1.
This commit was should fix issue #7586, but it does not.
This reverts commit e1c65ddfe1.