wip reproducing of #8792