Revert "some merge bullshit"

This reverts commit ccb6820ac27cc5f82ef0f6d1a1e741f98435b1ac, reversing
changes made to 2768c832f869cab4c1a15ef6ad40e38e72c054bd.