Revert "Regression in renderer"

This reverts commit 594ab7d2d0a88aea6d4137ee78f1946850ee4b0e.