Patch to implement the suggested feature.