Revert "this is the sucky shtuff"

This reverts commit 4f5f4de5794a481111337d675ef73c2fb5ac2ac9.