The wrapping/unwrapping now works both ways.