Revert "Attempting to refactor deferred renderer"

This reverts commit abc2869b3ddd3c96d51b710e46bd1ad0b7378935.