Related to issue #9235 btw.