Implemening Jeffs comments
Refs: #3887 reviewer=ompi-rm1.7