This re-applied patch from 25cbd13 which was lost at some point since missing patchset in series. This revision is to be back-ported to the final release.
