urgh, this still isn't working properly. i think we finally fixed it.

This commit reverts d2098b5d58c42a02c7b33fae02075d8928404884.