(hopefully) grab the last bit of logic from HEAD for a bugfix I've been trying to apply to the branch for days(!)