Use the standard reconstruction functions for retagging, will have to go in after atlas/athena!51419 (merged).