Boilerplate for the module #6337

One more case where you should now toggle the flag but leave the value there