Revert 8a04ec0..cfaff6e

This rolls back to commit 8a04ec0d14c8eb373bd7ac27c6ed37690897cdbc.
Man. Changes. Bad changes.