A fix for http://aspnet.codeplex.com/workitem/8311.