* Follow up 67db4dc / r17529 (my bad. :P)