Handler Changes

Handler Changes
Revert "Handler Changes"

This reverts commit 02e334cf695c131fdf45de8344ac27f5adec9ccf.