reversing some changes from prior merge test