Revert "Modify projects to try and get CI build right"

This reverts commit f92ac93954a7d4826e531ec4049524d300356a81.