Remove the GENERIC ifdef and commit to it.