Reorder remote operations for efficiency

[#83638736]

Signed-off-by: Michael Fraenkel <fraenkel@us.ibm.com>