[skip CI] Revert refactoring.