This is now handled as-needed as the control module is flushing its own callbacks. Closes ticket 25951.