Fix merged in version 7.3.0 upstream. This reverts commit 1fb7853b52. This reverts commit e847db9dc0.
1fb7853b52
e847db9dc0