Re-added needed bits to 2dcontext-cr boilerplate.