This reverts commit 7d1c661381. This commit breaks some device runtime builds. Need time to investigate.
7d1c661381