Revert to not store username