Revert "Alex's changes"

This reverts commit 1bc8b09108296bee4209a1ba1eb00fd39dcf4088.