back out unneeded user model change, update bundle versions