Regression in 181fb60159. Backport of 98296f86b3 from master
181fb60159
98296f86b3
Co-Authored-By: Simon Charette <charette.s@gmail.com> Co-Authored-By: Antoine Catton <acatton@fusionbox.com>