Revert "Merge branch 'peter'"

This reverts commit 5a3e4b6db553f91e2f1ed80fa39c64083fd2f281.