revert my previous commit (r159173), since as Eli pointed out, it's perfectly ok...