Revert "Split off some stuff"

This reverts commit c2cd52a0b4308eec259a68db805b9e6c1bfb5ade.