Revert "3.8 first commit"

This reverts commit 5b4567bff362f5a1ad1a5ae679ca4836db937b6a.
3.8 first commit