Added two handlers to the toronto playground. Removed one redundant handler.
Authored by: pkucirek 2012-09-12
Parent: [r20999]
Child: [r21001]