Reverting back to [c845b28714] did stop segfault.