Revert broken merge commit