This was done by #587 (commit af9fb6de77) but was accidentally reverted by commit 73acc73dbf.
af9fb6de77
73acc73dbf