revert 4.8 removal