Revert "Fix merge errors"

This reverts commit 311310983e4382eb684261a088ac96a74e954a12.