Fix issue where false is not set as override

#2695

Spaces is one of the modules that needs to have proper patches updated.  Updating in place for now.