This reverts commit cf624b23. It triggers crashes in clang, see the comments on github on the original change.