Revert "Revert "back to 4.7""

This reverts commit 1bfa154ff7f0c868f526273b2c28c2483f76c5af.