Reverted refactor