Backed out changeset 2566c7e54dcf (bug 993162) for suspecting this caused dt tools bustage on a CLOSED TREE