CLN: leftover rebasing from 405018c