This reverts commit da8583e9. This should also be covered by commit dc83b3ae. Change-Id: I173eb3e7f51288574e4807553200a9ca59a45fef