This reverts commit b18ddb0ac8bc232df2cfd2980bd22ee9beae7b12. svn path=/nixpkgs/trunk/; revision=31536