Address Chris' comments regarding metadata

This effectively reverts the race condition changes which will be moved to a separate commit / pull.