(face-spec-set-match-display): Revert the change from