This reverts commit 462963b5. Reason for revert: broke emma turbine build Change-Id: I2e49bb127e1eb5006e7e27a59c4e85efa63bb38e