e7c8b71a86
This reverts commit 8903b9fa8345726efbe9b92a759c98cc21c4c14b. there is no reason for these to be global Change-Id: I66a31c06f8426aeca348ef12d9b9ab59d6d5e55d