This reverts commit 988c55ce. Reason for revert: broke some tests Change-Id: Ib43099aebc8ff025e052337475bab13445da74eb