Use binstubs instead of overriding commands