Workaround for #7785