Revert "Dont pull in context without pre_context or post_context being set"

This reverts commit 8ec022ec40ec800b84c0d40fef182d0829664aa8.