Revert "merge conflicts"

This reverts commit f467a963b7bb39c91dcc22bc6ba08c3202679bab, reversing
changes made to 90932fa7774bae56c5f246e9b3a5c9b595af4553.