This reverts commit 3b33a04f. Reason for revert: This is crashing ExtServices on qt-dev Bug: 132679875 Change-Id: I60b7b6b8db33585f62e108389367c74ce682b922