Working commit of old WPF version