Revert "Fix build"

This reverts commit 28bfa250c9fa949a6a848b4390bb2b138acbe818.
Update device for newest build commit