Revert "Fukkin weirdness"

This reverts commit 86a773a15f42449d8935dbdffbc4578614675cd0.