4edffbf54f
(That commit, r60813, should never have been done to 2.69 branch, will revert it there, sorry :/ ).
(That commit, r60813, should never have been done to 2.69 branch, will revert it there, sorry :/ ).