Revert unintended half-done change

Change-Id: I29892be2d8d2d3ec02b0265a7b8387a332fa9dee