Revert "meh. this sucks."

This reverts commit 2f87606fbeb7dd444a62959f8a4547b2d9fc742f.