Revert and fix.
Refactor