Revert "The third set of changes"

This reverts commit d054a80cddf7b2f0505761c9d74a5859e5596bc8.