Revert "User data fix"

This reverts commit 8d16d645d150ff940d5287a4dd7de186d1dad4cf.