This commit is just previous version, but with all upstream stuff
reverted to its pristine state.

Debian changes in upstream stuff will be implemented after this commit
in different ways.