From Lars Ruoff (who also contributed the previous change; my apologies