Revert "Fixed Handler"

This reverts commit c87d5eca01694708b00ca30cfa3522e49abef001.