Revert 'Core/Account: Remove unused helper functions'