Breaks tests. Bug: 62821960 Bug: 65049545 This reverts commit 798eab03. Change-Id: Ie96903df06bbbe41f288f5b75a5114b142998fac