Revert "More things"

This reverts commit 577fd27038e2c6900d06a4cba4fef9579b2b4b8d.