Revert "Some stuff that was left out"

This reverts commit 9e3b908c23a084a97cd7dc980c23f699d9fccc96.