meh, still calls rebuild_topic_data, so we'd probably either modify that function or give it a helper function.