Revert "REVISED and DONE"

This reverts commit 28a87c6e26757f7019b21b5a699b7f994b6eecf0.