Revert "Be robust if one does not use viewer() or editor."

This reverts commit ef8a940ffcdd022f3371086c83ea1eba3e131768.