My fix was wrong again.  Base this try off of @mantiz's fix in #9016