Ok, this is fixed now. Didn't want to get too specific in the test, but it's not too bad. Will land after travis runs.