Here is another patch for branch 7.x-3.x