Revert "Overriding and Fixing"

This reverts commit 4f5cf6e790dedb18e2ef863276534506ffdbbd31.