Revert "Remove IDeviceHandler reference"

This reverts commit d05e03de0f8263dad32ab37651524731ac9e95fc.