Fixing gpu-manager Overwriting xorg.conf Issue

I have recently installed the NVIDIA drivers on my Xubuntu 15.10 machine but I had to remove them due to improper multi-monitor setup. Everything went fine, except for the fact that gpu-manager seems to overwrite my xorg.conf file with a wrong version containing NVIDIA stuff.

I know that there is a reported bug related to this, and I tried applying the hotfix suggested there but to no avail; namely, I changed /etc/init/gpu-manager.conf to:

#start on (starting lightdm
#      or starting gdm
#      or starting kdm
#      or starting xdm
#      or starting lxdm)
task
exec gpu-manager --log /var/log/gpu-manager.log

My xorg.config file keeps being overwritten with the NVIDIA stuff.

Any other suggestions? I am also a bit concerned that some people suggested that the hotfix above might freeze the syystem (whatever that means).