This reverts commit c2eaccba60e23eb545870d325962ffa5fa9ffa38. Change-Id: Ic5632658c483ab345c4ce0375f4e506b9fd495ac