Revert "Fix build for the three devices"

This reverts commit 0d95eb8c14b1ebffcd634fb65da44088d1d43e8d.