chiark / gitweb /
partial revert of fed6df8