Revert 4.9