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

This reverts commit 1c369033af2363f87ada65e4ef1fd5f0ec5f2d35.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the rosping sub directory