This functionality was added by me for Cumulus, but after better
understanding Cumulus, this will not be required.