Revert of parts of the last refactoring