Fix bug 22944 in a much better fashion (using watchlist parameter)