Revert "Simpler Renderer"

This reverts commit 4a76f1fe8a2f08dd25096902ef8c187f26705082.
Revert "Revert "Simpler Renderer""

This reverts commit 8d3405c483cf025d12e6eaac4f5d7ab55e122b26.
Revert "Revert "Revert "Simpler Renderer"""

This reverts commit df84e6128d60d4ac0aa931ac6c2eaa211fb68e8a.