Redo some

This reverts commit 8da6a162da159842e34049faa262826c57a49124.