This reverts commit f945a3c1. Fixes allmodconfig builds Change-Id: I18fe56a0c68661ce50f75b79f8e9730dfc5822f0