Revert "Fix merge conflict"

This reverts commit 697dbc3618e25a908c37b6d29d8478bcd2ebc953.