See commit message and also my original comment at 13b4d766

I hope this does not break compatibility too much.

/cc @kazuhiko @romain @seb