Revert "Fixed merge conflicts"

This reverts commit 209c475c2e7a3e7604af7d9d9175233f3f236fe2, reversing
changes made to bf2258a85a5ed21caf5ac664c1b125375d8e33af.