This reverts commit 8032ff32. Several branches are broken because of this. Change-Id: I2d9f8b1cc8f93ed8de7d1e01d49c7cd29417820d