Do not cherry-pick legacy sensors