Revert 2841585..72d620b

This rolls back to commit 2841585c2da85decc63e2247b5467488eb6718e0.
before attempting to change "grab_marks" method