I tried reverting the e96402a0052d320cbd0a82fe788b00b2d3fe81bf commit but am not sure how to resolve the merge conflict (I guessed a few times but got compilation errors).