This reverts commit e6053152. Actually #17183 is not completely fixed, so the Known Issue is still needed.