This reverts commit 10ec4f93. Was breaking many tests in the test environment. Change-Id: I96cdbfe9620e4daff19ab448dc44e5315d89ebb7