Revert "Fixing conflicts"

This reverts commit 306a4e0de3fce9d400a2aedc2a25085d38fe6e23, reversing
changes made to 44a07c852fd9adf760b9cc4d1a2629fdc5b60591.