Reverted to old memory usage.