Revert "Refactor."

This reverts commit d25ef4d58e89941d10ca6ffbb542e740c436b1e9.