Revert updates to SIP API v2. Support for plugin layers by Peter Wells.