Revert 5d82b0e..98f6f80

This rolls back to commit 5d82b0e5111af33bf19c4986a88589a82e42e05b.
Paged Grid fix