Revert "Improvements to render methods"

This reverts commit 2ac50a0474d7e2147aec00cb0099e0160c9744ab.