Merge pull request #74 from elemoine/revert

Revert last two commits