Revert "Added Fix for Bugzilla: https://bugzilla.xamarin.com/show_bug.cgi?id=20102"

This reverts commit f1064d067381e4f7a525c017fa8dc6591d8b9e42.
Added Fix for Bugzilla: https://bugzilla.xamarin.com/show_bug.cgi?id=20102

Added less intrusive fix to 20102