(cherry picked from commit f7f0ecb566)
f7f0ecb566
* Converted Tonks' hangout events into the new system, and cleaned up relevant code.