This reverts commit e734fe8d. Reason for revert: May be breaking tests. Change-Id: I6c0c04a60c1b4f329c472d28a3c2666526bd6383