Pull Request: Revert DeviceHandler package call for now

Need to do some more stuff here.