somehow we missed the revert
better function isolation
checkpatch again
checkpatch again