This should not be removed until bug 1087425 is fixed or create a separate issue to track