This reverts commit 3e3f86458d. Bugs should be fixed now. Change-Id: If4279746074abfa42b8240d4e98dec59ab15d332
3e3f86458d