Back-port missing code from raven-4.x