reverting to old swizzling