Revert "Refactor."

This reverts commit d89372d81d69d8d2180b9e9148c15401e78289ab.