Fixes #8236: 1.6 compatibility