Undo mistaken changes in f03f899. Issue #320.