Revert "Merge conflict"

This reverts commit f4dc94162437aa6e65053a1496650ab75b86e73d.