Fix project configuration

This reverts sections of commit
3faf2a73cc8b3783e352e32532932743f6bc5fa8.