This reverts commit d775fc39. The patch is wrong wrt undef and the author didn't fix it after 2 weeks.