Revert afe57485.  Fixes #442