Fix for #641: back off 003751a.