undo undesired changes to two files

Perhaps someone can squash this commit with several previous ones...