Yuck!  Perhaps we can add a class attribute 'xblock_original_class' or something, that serves as both the marker that it's been mixed into, and also has the class name of the original.