Co-authored-by: Jason Cameron <git@jasoncameron.dev>
Imports a patch previously exclusive to Botstopper. Signed-off-by: Xe Iaso <me@xeiaso.net>