This reverts commit f743b163fc764b7ebf701a9e65b13d308530d750. Change-Id: Ie274a024d2cdb6f11082e6bf391732a304863074