Sync devtools
Revert "Kill dead code"

This reverts commit 48138d0b6eee8615b55127b1507519ae53858d16.