Revert "DTSI - Optimization"

This reverts commit d4c98e2fdefaf47abdd456fedfd74e041b4e37bc.