CNAME chasing causes infinite loop if rewrite_wildcard_owner_names is false

Consider the following zone file:

$ORIGIN some.test.
@         IN  CNAME x
*         IN  CNAME y

If rewrite_wildcard_owner_names is set to false for some.test, then a query to any subdomain of some.test causes the server to hang because of an infinite loop.