Revert "Revert "Revert "Revert "be more robust with handling unknown sensors""""

This reverts commit 8b8dfe25230526f8d18b0f3fc3ab9dd49be1bc76.