Updated tests for issue #4491.  Reverts 02937aca22fd71e2b1438e8024ea490a51df6b8a.