Fixed some details in the context factory.
Revert "Reenabled the context factory."

This reverts commit e970985b758b5209c72ca83c23b0e3c202157058.

This commit accidentally enabled some experimental feature that are not yet
complete and tested.
Enabled the context factory.
Corrected typo.