Regression after commit ff382434f89ff032c33e31ada63d1361597c444e, sorry.
lgtm
Committed patchset #1 manually as rabdecd6 (presubmit successful).