Revert "Merge remote-tracking branch 'olsr/release-0.6.6' into commotion"

This reverts commit 1d0f4bc4ef052eaccd1f4ccd63578b76a0d8e15e, reversing
changes made to dd0ef089221a34879603cedb6decf5e85b748380.