ftr, i've reverted 04242358 again (in b76839ee970e16f64862335c507991f8ab8ca05b)