Revert "Second iteration"

This reverts commit d611f7438d32d0399b0091eb4492454c3928e016.