Revert "Update to allow grant overload"

This reverts commit 159799bb23c75164a0a9021a6820e43da1027d5f.