Merge "Revert "AJAXify watchlist editor""