Revert "Trimmed the branch to only the cffi sub directory"

This reverts commit 938eaa08e518eb7d0597990b1ef723b96157d288.
Rebase from 'upstream'
Trimmed the branch to only the cffi sub directory