Don't remember what these changes are, but committing so that I can do
1.7 prep