Revert "First Alex-branch commit"

This reverts commit b16d070a4ff198ba4dd630566a6caf1d7e0db1e9.