OHS asked for the change for #1822 be reverted.

The issue will be fixed in v3.9.0.