Revert "back to 4.7"

This reverts commit 5fcb809b74d0dcd815cfefabcc9cae25d61143df.