Revert part of commit 88dbf84 to resolve issue #422.