This reverts commit 311e1c83. Reason for revert: uapi impacting changes can't be FROMLIST Change-Id: I1d793178ab9a529f1be15a14c7e268e3e3953263