Hygiene: Refactor special uploads code

This code doesn't follow the patterns set elsewhere so moving here.

Change-Id: I21a8cd3f89dfc187b0c46c513a1fcbf7c7178549