Revert "Use FindDevice to get device object path" partially