oh yeah, my mistake. Could you please reopen this PR for the 2.4 branch (master)?