Use guard from upstream repo