Fix for 2-4-stable.