Undo grant rewind, implement directly

This is #101 rebased on top of the latest `master`.