Remove granting GRANT option

Change-Id: I1e69827ba9491c67cc5a36fa1a7c632b0896ec51