Revert "Merge conflict"

This reverts commit 924606af5b9acb859913fac8b6a9df038b7a6ffc, reversing
changes made to 2dda3eaa06dc7d1c69b04f92b9957a8219d1f91d.