Revert "And the rest"

This reverts commit c6496df729e3979abc9bb9a2eedcd490801a7811.