Should be unnecessary after c/115476. This reverts commit ba823cee. Change-Id: I3ef4d3e04805e450038d469d9672dc064f729b0f