Revert "Merge conflicts"

This reverts commit 9c99c7ffa316f03198bd1ee70216adcc2e6b69b5, reversing
changes made to 7f684df4e42b6257f4d9823b0432c560453a0274.