Revert "Compile with 4.7"

This reverts commit c60b824d2358ef5f168fe98fe42e3da4fe70d00f.