The regression was caused by the fix for #13781 (commit f51e409a). Reason was leaving off some crucial lines when resolving a merge conflict.
