Revert "Formatting/logic change for visibility checks"

This reverts commit 50002dee0f019ca56b2f08d487ed447b46eac14d.
BroadleafFormatting