Roll back change, specifying security context.
Add support for long. missing class.