Good write up of the issue. Great work hunting this down @njx , @peterflynn , @gruehle 
 fix for #5589 confirmed.