reverted SPAtomic changes