Revert "3rd changes"

This reverts commit 530b1c084c24d870a385b9937b0dd7247d39b2c7.