Revert last change v2

Incompatible source. Going back to the point where building source was possible.