Revert previous commit (ab31e0197ee951fea4f8920d88d966cb397be0ef) for now, until we're more sure of the recursive call situation (see discussion at #507).