Reverted vm_memory and vm_swap behaviors. WIP (ON-770)