This reverts commit 02600fb66b. Broke some tests. Change-Id: Ic47b23a935bf90aba817073c27cd247306db7d5f
02600fb66b