What is the problem?

Special:UnwatchedPages lists all pages that no user is watching.

1. It counts pages whose watches have expired as still being watched, so they are not listed when they should.
2. When you click the "Watch" link next to a page, the old watchlist popup appears, without the expiry dropdown (see screenshot).

Steps to reproduce problem

1. Go to Special:UnwatchedPages
2. Find one of the listed pages
3. Use ApiSandbox to watch it for 1 second (for example: Special:ApiSandbox#action=watch&expiry=1 second&titles=$title)
4. Go back to Special:UnwatchedPages

Expected behavior: The page you found in step 2 will still be there.
Observed behavior: The page with the expired watch is not there.

Screenshots (if applicable):