Revert "more dts fixes"

This reverts commit 090e5c87a97e5b28b71bcdf43fa98699277be718.
Revert "dts: idk"

This reverts commit eb0aa3d6a773e42f8eb14ac01219a6dd81264970.
various build fixes