1.9.1: Fixes #13265

Hope we will not revert this in next release