back to old atomic impl