Revert "minimal changes"

This reverts commit 88b6325680168769046bb5eced7337de0314876e.
Merge Conflicts