c31e194120
This reverts commit 6823f5e3374f00f43e9d20a4db12d63e0bc5da84. Fixes #10205
This reverts commit 6823f5e3374f00f43e9d20a4db12d63e0bc5da84. Fixes #10205