Revert broken check for default context

Addresses #872