- This is a partial revert of c2280a2009, it was already fixed upstream, but not for the `.basic` variant. - Resolves #3252 (cherry picked from commit 7fcb9c3636)
c2280a2009
7fcb9c3636