This reverts commit 97b3e66d3e. This cherrypick was actually obsolete. The file had already moved elsewhere. Change-Id: Ia209f230b2f5d621ec890d901dea8e5fa135fc87
97b3e66d3e