ugh, FINE, I'll fix this for 2.6