I'll update after this is merged to remove these old contextkit files.