This commit derives from 8f91da6f and b1baeafd. Since it's a one-liner, it's has been discussed with Raphael without a formal review request.