Revert "fix conflicts in merge"

This reverts commit ad4b547385bed0df41d42c8dbff39664a4c96817, reversing
changes made to 11af45c433d2d55f523bf7aab62ca4d9e8ed5380.