Remove conflicting files from commit

This partially reverts commit b45dd7ccde1e789b9676b9271488de1e9848614c.