[Primo] Restore @adam3smith's changes