revert some changes that killed pre-3.16 kernels
revert some changes that killed pre-3.16 kernels

openss7/openss7,openss7/openss7,openss7/openss7,openss7/openss7,openss7/openss7,openss7/openss7,openss7/openss7,openss7/openss7