Broke the build, reverting. This reverts commit a2991da0. Change-Id: I2bdfa70fbd8a6c03e48426f85eeb63896762d5da