r25788: Use a single routine to handle the creation of modify requests in the