Revert "Conflict fix"

This reverts commit 30401c4580ff08298db0ec646847b2e21d5da767, reversing
changes made to f8c15515fe41c8489f113314ac3fd727ee0f725d.