With the recent introduction of upsert_thread_subscriptions (note the plural), we must get rid of upsert_thread_subscription (singular), as the new method handles it more elegantly (especially in the SQLite store).
See my comment here #5848 (comment).