Removed the mysterious add_topic from my older patch.