#4149

Jason I think it is safe to include this code in 2.5.1