Revert "Fixing merge conflict"

This reverts commit bb7390de007ab81ca3b3a9031e90eca56ae0e336, reversing
changes made to db263f09311e5450f0cd424ddfaace9345b628db.