Revert "Resolving conflicts"

This reverts commit 93aa291cd1c5a4732956f6a0e8e3a9df8c20d254, reversing
changes made to e380dfc1aca4ffbfffa41d29a6967a7ebe09c163.