Fix merge errors 2
Revert "Fix merge errors 2"

This reverts commit 5b5e639ac6a562a05a1e23b8972fb173c76833a8.
Merging is hard