Semi revert: back to original 4.7.