Revert "Resolving conflict"

This reverts commit 636f0877cd835f2f982f1ada233422985f501b8f, reversing
changes made to 765f93811eaaab4ac2daa24147f5bb0149a5ab8b.