Try to fix the problem of inconsistent grant order

Rough spike so far.

/cc @lstoll @ymendel