Let's fix the only grief bypass I'm aware of.