Backport of fault handler from 2.6.23