Forward-port the security model from 2.0