fix(expired) - check for old schema as well
Merge remote-tracking branch 'adrian/fix-expired'