Revert PMEM only. Add missing file