Revert "Updates #25121 restrict # of cases where query's is_home property is modified"

This reverts commit 527ca303688e9b5e8f10abe4a522ae6fc94f073d.