Indeed, it sounds like Eric already has a patch ready with my proposed short-term solution