Revert "Current state working on #1766."

This reverts commit 14a79749b6b6edcbf919d26907df19d9ab522c5a.
More changes