Revert "And a lot more"

This reverts commit e2bedce7a5ad9d85c890a55280c556f3d9ec7a07.