Revert "Revert "Revert "more things"""

This reverts commit 0407951c1b7f2967279793fbe6eeb317ad8ae9c1.