Reverting out portion of change in c2abe0f8dc3eae511abd0ba0d6538a16ca7bfc75

This speed up interfered with the creation of doors, need to find a way to implement the speed up but not break doors

[#59061568]
Merge branch 'develop' of github.com:NREL/OpenStudio into develop