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