just drop the current variant of this into the repo, still doesn't work as expected