Remove code changes.  Replace with test/doc fix for cross_fade