Reverse the comparison thing
Merge branch 'fix/event-expiry' into draft