Rolling some of the previous changes

@doomspork
Here are a few changes rolled back we talked about