This reverts commit ddb4902597. Change-Id: I7d5433bf676661ede208f840c27a71abbe663195
ddb4902597
a12b964839