As discussed in #3861
As discussed in #3861