Revert "Fix merge"

This reverts commit 7ccd970a3f889edeef5b542e07ac0d705666d427, reversing
changes made to 494cb9f6af21edaf3ec51fecb7d2942cc8a0b8dd.