(And the subsequent attempts to sort out licencing problems.)

This reverts commit dee74964.
This reverts commit 9fa7eae8.
This reverts commit cdb769a3.
This reverts commit f32874a0.
This reverts commit afc22339.
This reverts commit c9a0cc11.