Revert "Added better support for custom controls in WPF"

This reverts commit 6d9c7ccd5f9a13d75869dab4d3e72f9355d387b4.