Revert "more fixes to renderer"

This reverts commit 3444a0fc312617f86c90aa04313542abc01dcdab.