Revert "Merge branch 'master' of https://bitbucket.org/schnorr/compil-2014-1"

This reverts commit fd7cfae1f0135f60d2b04607168c6d3fc6eafe66, reversing
changes made to 1c32a7aa407a901f259f4afbd6b742e9c01ae054.