Making @grant enabled by default, but possible to opt-out of, and removing the grant sniffing