Backed out changeset a6a7df40f00a (bug 997239) for causing regresssions per #devtools