addressing change made in server 2.4rc0.