If people agree, I can make at patch similar to bug#42184#17 for those
faces only.