Revert "Remove unused code"