Reverting some stuff.

Things, Carl. Thiiiiiiiings.