Revert part of ca84762.  Fixes #1135.