If that doesn't get them, try again with proto=imps.
If one of these gets the right clicks back, you can make it permanent by creating a file named /etc/modprobe.d/psmouse.conf with the following contents (just change bare to imps if that's the one that worked).
I'm surprised you got the right clicks previously. Try the following.
sudo modprobe -r psmouse
sudo modprobe psmouse proto=bare
If that doesn't get them, try again with proto=imps.
If one of these gets the right clicks back, you can make it permanent by creating a file named /etc/modprobe. d/psmouse. conf with the following contents (just change bare to imps if that's the one that worked).
options psmouse proto=bare