Revert "Changes From Pavel"

This reverts commit 8a620bbf76753b7b74daa16a945dad1d047ee6c4.