Actually make opting out work *cough*