Incorporated from BIND-4.9.3-BETA9.