Remove no-op-face and use default instead