This reverts commit dcddc476651deb72a27798de56eef584e5be5d32. Change-Id: Ie2402167fc7cd3d5e57bf2fba704fdf00cfcb4fe