Revert 2f70ecd..cc23a5e

This rolls back to commit 2f70ecdc5cf13cde0c5138b3bf8a37b1d10331dc.
figured out render context error