This reverts commit b156ce3b3b which is
commit 5ad1ab30ac0809d2963ddcf39ac34317a24a2f17 upstream.
It causes a CRC abi break so revert it for now. If this change is
really needed, it can be brought back in an abi-safe way in the future.
Bug: 161946584
Change-Id: I385d80527d8c3eb121f005b244da1ffac8fb7074
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>