The intermediary fix in #2959 was added for v0.0.122 to quickly regain compatibility with CLN nodes. As CLN is about to fix this in a point release, we should revert it v0.0.123 or v0.0.124.
