Revert "Do not cherry-pick legacy sensors"

This reverts commit c8e1b5f84562ff2baf7fd262a754e5f4e7e3edd5.