Revert grid level showing
Reapplied bug fix for 5.0