[#1778] extract followup

Requires #1875