I'll comment on this in the other PR, since I literally cherry-picked before I applied so it would be a clean rebase.