Revert "Merge branch 'vladimir'"

This reverts commit 985d14ecb6c234b034dec6c63a0dd13cc6f49811, reversing
changes made to 42d1a082ea97da46885f5cbcd48f57eb4d842598.
gitignore