Fixes #7390, at least according to ivaniskandar (cherry picked from commit b15073fd6124747c1e64cffc5e758c94cf6a6b7a)