r13606: An attempt to fix #3525.