Replace KVO (which was crashing) with swizzling.