Revert "Updates for Debian Sid"

This reverts commit 5bd66d15f484ee3a58a708120b6a6a35bfe86777.
Revert "No OSL"

This reverts commit 3accbb690b122fbc9ca76e5ba76bb4ca248ec7e8.