Revert "Fix broken pillar and broken grains context inside rendered pillars"

This reverts commit 8ac3aad48aa26fcb445dbcecdf8c639be92d8558.