Remove refactoring attempt for the time being.