Don't just remove req.grace, put a cluestick in place