This reverts commit 5e8dfb9065e260f39334016b777423c413463ffe. Change-Id: Ia82e11b65c0d175f2d3b517e43176213eb1a4ae0