Restored accidentally commented out code (ref #1097).