make devtools work with 25 trunk