Reverted to the old context handling since it's needed within the configurations.