This reverts commit a1322f06. Reason for revert: some tests are failing Change-Id: Ib8015f3f2d3a22db8f59a5fb2fecff5b1cad97c4