Renderless 1192

Fixes point 2 in #1192