Removed #8970 since it has been fixed