This reverts commit 888dbca2. Reason for revert: <INSERT REASONING HERE> Change-Id: I259327a6ca507e2614cacdcdabdeca7df48b8ed2 (cherry picked from commit 3c097aa4)