Revert: Refactor (06425a3b7e0b29db1a405d8b24767a546d6cc003)