"Revert "back to 4.7"

This reverts commit 8ee084f1eb5ce8affb2a20d549b8f22844c0a4d3.