Revert "update to new merge"

This reverts commit c069d7db592c67ef65b863b866277288924bf0ec.