Revert "fixed merge (i hope)"

This reverts commit 5930dcc2328cee4c3d902e2e1572cdf7f4c7bccd.